Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 25 Oct 2011 16:27:00 +0000 (09:27 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 25 Oct 2011 16:27:00 +0000 (09:27 -0700)
commit9ec2916ce30b15b26fce00b9e15e49a2aa4b4c11
tree386e5971bf371c388f7a669afdf097f26f4bc0fb
parent1f1cbc2a42c9ddf7132cd965ada5173d0e698d44
parentc05c65ad7a909c520d7293ea4bdadbaaa5d69fc1
Merge from trunk.